1.1

Assets/BuildSystem/Data/PlaceObject_SO.cs

@@ -72,7 +72,7 @@ namespace BuildSystem
                     new object[4]{null,null,null,null},
                     new object[4]{null,null,null,null},
 
-                    new object[4]{null,null,true,true},
+                    new object[4]{null,null,null,true},
                     new object[4]{null,null, true, true},
                     new object[4]{null,null,null,null},
 
@@ -81,21 +81,21 @@ namespace BuildSystem
                     new object[4]{null,null,null,null},
 
                     new object[4]{null,true,true,null},
-                    new object[4]{null,true,true,null},
+                    new object[4]{null,true,null,null},
                     new object[4]{null,null,null,null},
                 };
             } else if (nameString == "T2Left") {
                 roadGoInfo = null;
                 roadGoInfo = new List<object[]>() {
                     new object[4]{null,null,true,true},
-                    new object[4]{null, null, true, true},
+                    new object[4]{null, null, true, null},
                     new object[4]{null,null,null,null},
 
                     new object[4]{null,null,null,null},
                     new object[4]{null,null, null, null},
                     new object[4]{null,null,null,null},
 
-                    new object[4]{true,null,null,true},
+                    new object[4]{true,null,null,null},
                     new object[4]{ true, null, null,true},
                     new object[4]{null,null,null,null},
 
@@ -108,7 +108,7 @@ namespace BuildSystem
             {
                 roadGoInfo = null;
                 roadGoInfo = new List<object[]>() {
-                    new object[4]{null,true,true,null},
+                    new object[4]{null,null,true,null},
                     new object[4]{null, true, true, null},
                     new object[4]{null,null,null,null},
 
@@ -117,7 +117,7 @@ namespace BuildSystem
                     new object[4]{null,null,null,null},
 
                     new object[4]{true,true,null,null},
-                    new object[4]{ true, true, null,null},
+                    new object[4]{ true, null, null,null},
                     new object[4]{null,null,null,null},
 
                     new object[4]{null,null, null, null},
@@ -134,14 +134,14 @@ namespace BuildSystem
                     new object[4]{null,null,null,null},
 
                     new object[4]{true,null,null,true},
-                    new object[4]{ true, null, null, true},
+                    new object[4]{ null, null, null, true},
                     new object[4]{null,null,null,null},
 
                     new object[4]{null, null, null,null},
                     new object[4]{ null, null, null,null},
                     new object[4]{null,null,null,null},
 
-                    new object[4]{true, true, null, null},
+                    new object[4]{null, true, null, null},
                     new object[4]{ true, true, null, null},
                     new object[4]{null,null,null,null},
                 };
@@ -153,8 +153,8 @@ namespace BuildSystem
                     new object[4]{null,null,null,null},
                     new object[4]{null,null,null,null},
 
-                    new object[4]{null,null,true,true},
+                    new object[4]{null,null,null,true},
-                    new object[4]{null,null, true, true},
+                    new object[4]{null,null, null, true},
                     new object[4]{null,null, true, true},
 
                     new object[4]{null,true,null,null},
@@ -162,8 +162,8 @@ namespace BuildSystem
                     new object[4]{null,null,null,true},
 
                     new object[4]{null,true,true,null},
-                    new object[4]{null,true,true,null},
+                    new object[4]{null,true,null,null},
-                    new object[4]{null, true, true, null},
+                    new object[4]{null, true, null, null},
                 };
             }
             else if (nameString == "T3Left")
@@ -171,15 +171,15 @@ namespace BuildSystem
                 roadGoInfo = null;
                 roadGoInfo = new List<object[]>() {
                     new object[4]{null,null,true,true},
-                    new object[4]{null, null, true, true},
+                    new object[4]{null, null, true, null},
-                    new object[4]{null,null, true, true},
+                    new object[4]{null,null, true, null},
 
                     new object[4]{null,null,null,null},
                     new object[4]{null,null, null, null},
                     new object[4]{null,null,null,null},
 
-                    new object[4]{true,null,null,true},
+                    new object[4]{true,null,null,null},
-                    new object[4]{ true, null, null,true},
+                    new object[4]{ true, null, null,null},
                     new object[4]{ true, null,null,true},
 
                     new object[4]{null,null, true, null},
@@ -191,8 +191,8 @@ namespace BuildSystem
             {
                 roadGoInfo = null;
                 roadGoInfo = new List<object[]>() {
-                    new object[4]{null,true,true,null},
+                    new object[4]{null,null,true,null},
-                    new object[4]{null, true, true, null},
+                    new object[4]{null, null, true, null},
                     new object[4]{null, true, true, null},
 
                     new object[4]{true,null,null,null},
@@ -200,8 +200,8 @@ namespace BuildSystem
                     new object[4]{null,null, true, null},
 
                     new object[4]{true,true,null,null},
-                    new object[4]{ true, true, null,null},
+                    new object[4]{ true, null, null,null},
-                    new object[4]{ true, true, null,null},
+                    new object[4]{ true, null, null,null},
 
                     new object[4]{null,null, null, null},
                     new object[4]{null, null, null, null},
@@ -217,15 +217,15 @@ namespace BuildSystem
                     new object[4]{null, true, null,null},
 
                     new object[4]{true,null,null,true},
-                    new object[4]{ true, null, null, true},
+                    new object[4]{ null, null, null, true},
-                    new object[4]{ true, null,null,true},
+                    new object[4]{ null, null,null,true},
 
                     new object[4]{null, null, null,null},
                     new object[4]{ null, null, null,null},
                     new object[4]{null,null,null,null},
 
-                    new object[4]{true, true, null, null},
+                    new object[4]{null, true, null, null},
-                    new object[4]{ true, true, null, null},
+                    new object[4]{ null, true, null, null},
                     new object[4]{ true, true, null,null},
                 };
             }
@@ -237,7 +237,7 @@ namespace BuildSystem
                     new object[4]{null,null,null,null},
                     new object[4]{null,null,null,null},
 
-                    new object[4]{null,null,true,true},
+                    new object[4]{null,null, null, true},
                     new object[4]{null,null, true, true},
                     new object[4]{null,null,null,null},
 
@@ -245,7 +245,7 @@ namespace BuildSystem
                     new object[4]{null, true, null,true},
                     new object[4]{null,null,null,true},
 
-                    new object[4]{null,true,true,null},
+                    new object[4]{null,true, null, null},
                     new object[4]{null,true,true,null},
                     new object[4]{null,null,null,null},
                 };
@@ -255,14 +255,14 @@ namespace BuildSystem
                 roadGoInfo = null;
                 roadGoInfo = new List<object[]>() {
                     new object[4]{null,null,true,true},
-                    new object[4]{null, null, true, true},
+                    new object[4]{null, null, true, null},
                     new object[4]{null,null,null,null},
 
                     new object[4]{null,null,null,null},
                     new object[4]{null,null, null, null},
                     new object[4]{null,null,null,null},
 
-                    new object[4]{true,null,null,true},
+                    new object[4]{true,null,null,null},
                     new object[4]{ true, null, null,true},
                     new object[4]{null,null,null,null},
 
@@ -275,7 +275,7 @@ namespace BuildSystem
             {
                 roadGoInfo = null;
                 roadGoInfo = new List<object[]>() {
-                    new object[4]{null,true,true,null},
+                    new object[4]{null,null,true,null},
                     new object[4]{null, true, true, null},
                     new object[4]{null,null,null,null},
 
@@ -284,7 +284,7 @@ namespace BuildSystem
                     new object[4]{null,null, true, null},
 
                     new object[4]{true,true,null,null},
-                    new object[4]{ true, true, null,null},
+                    new object[4]{ true, null, null,null},
                     new object[4]{null,null,null,null},
 
                     new object[4]{null,null, null, null},
@@ -301,14 +301,14 @@ namespace BuildSystem
                     new object[4]{null, true, null,null},
 
                     new object[4]{true,null,null,true},
-                    new object[4]{ true, null, null, true},
+                    new object[4]{ null, null, null, true},
                     new object[4]{null,null,null,null},
 
                     new object[4]{null, null, null,null},
                     new object[4]{ null, null, null,null},
                     new object[4]{null,null,null,null},
 
-                    new object[4]{true, true, null, null},
+                    new object[4]{null, true, null, null},
                     new object[4]{ true, true, null, null},
                     new object[4]{null,null,null,null},
                 };
@@ -321,8 +321,8 @@ namespace BuildSystem
                     new object[4]{null,null,null,null},
                     new object[4]{null,null,null,null},
 
-                    new object[4]{null,null,true,true},
+                    new object[4]{null,null,null,true},
-                    new object[4]{null,null, true, true},
+                    new object[4]{null,null, null, true},
                     new object[4]{null,null, true, true},
 
                     new object[4]{null,true,null,null},
@@ -330,8 +330,8 @@ namespace BuildSystem
                     new object[4]{null,null,null,null},
 
                     new object[4]{null,true,true,null},
-                    new object[4]{null,true,true,null},
+                    new object[4]{null,true,null,null},
-                    new object[4]{null, true, true, null},
+                    new object[4]{null, true, null, null},
                 };
             }
             else if (nameString == "T32Left")
@@ -339,15 +339,15 @@ namespace BuildSystem
                 roadGoInfo = null;
                 roadGoInfo = new List<object[]>() {
                     new object[4]{null,null,true,true},
-                    new object[4]{null, null, true, true},
+                    new object[4]{null, null, true, null},
-                    new object[4]{null,null, true, true},
+                    new object[4]{null,null, true, null},
 
                     new object[4]{null,null,null,null},
                     new object[4]{null,null, null, null},
                     new object[4]{null,null,null,null},
 
-                    new object[4]{true,null,null,true},
+                    new object[4]{true,null,null,null},
-                    new object[4]{ true, null, null,true},
+                    new object[4]{ true, null, null,null},
                     new object[4]{ true, null,null,true},
 
                     new object[4]{null,null, true, null},
@@ -359,8 +359,8 @@ namespace BuildSystem
             {
                 roadGoInfo = null;
                 roadGoInfo = new List<object[]>() {
-                    new object[4]{null,true,true,null},
+                    new object[4]{null,null,true,null},
-                    new object[4]{null, true, true, null},
+                    new object[4]{null, null, true, null},
                     new object[4]{null, true, true, null},
 
                     new object[4]{true,null,null,null},
@@ -368,8 +368,8 @@ namespace BuildSystem
                     new object[4]{null,null, null, null},
 
                     new object[4]{true,true,null,null},
-                    new object[4]{ true, true, null,null},
+                    new object[4]{ true, null, null,null},
-                    new object[4]{ true, true, null,null},
+                    new object[4]{ true, null, null,null},
 
                     new object[4]{null,null, null, null},
                     new object[4]{null, null, null, null},
@@ -385,15 +385,57 @@ namespace BuildSystem
                     new object[4]{null, null, null,null},
 
                     new object[4]{true,null,null,true},
-                    new object[4]{ true, null, null, true},
+                    new object[4]{ null, null, null, true},
-                    new object[4]{ true, null,null,true},
+                    new object[4]{ null, null,null,true},
+
+                    new object[4]{null, null, null,null},
+                    new object[4]{ null, null, null,null},
+                    new object[4]{null,null,null,null},
 
+                    new object[4]{null, true, null, null},
+                    new object[4]{ null, true, null, null},
+                    new object[4]{ true, true, null,null},
+                };
+            }
+            else if (nameString == "TenTwo")
+            {
+                roadGoInfo = null;
+                roadGoInfo = new List<object[]>() {
+                    new object[4]{null,null, true, true},
+                    new object[4]{null, true, true, null},
                     new object[4]{null, null, null,null},
+
+                    new object[4]{true,null,null,true},
+                    new object[4]{ null, null, true, true},
                     new object[4]{ null, null,null,null},
+
+                    new object[4]{true, true, null,null},
+                    new object[4]{ true, null, null,true},
                     new object[4]{null,null,null,null},
 
+                    new object[4]{ null, true, true, null},
                     new object[4]{true, true, null, null},
+                    new object[4]{ null, null, null,null},
+                };
+            }
+            else if (nameString == "TenThree")
+            {
+                roadGoInfo = null;
+                roadGoInfo = new List<object[]>() {
+                    new object[4]{null,null, true, true},
+                    new object[4]{null, null, true, null},
+                    new object[4]{null, true, true,null},
+
+                    new object[4]{true,null,null,true},
+                    new object[4]{ null, null, null, true},
+                    new object[4]{ null, null,true,true},
+
                     new object[4]{true, true, null,null},
+                    new object[4]{ true, null, null,null},
+                    new object[4]{ true, null,null,true},
+
+                    new object[4]{ null, true, true, null},
+                    new object[4]{ null, true, null, null},
                     new object[4]{ true, true, null,null},
                 };
             }

Assets/BuildSystem/Scripts/Car.cs

@@ -12,6 +12,8 @@ namespace BuildSystem
         [Header("目前所在的位置")]
         private Vector2Int now;
         public Transform fordir;
+        public bool isTurnIng = false;
+
 
         public int roadId;
         public Dir curDir;
@@ -72,7 +74,7 @@ namespace BuildSystem
                 if (raycastHit.collider.tag == "CarFr")
                 {
                     isCanMove = false;
-                    stupT += Time.deltaTime;
+                    //stupT += Time.deltaTime;
                 }
                 else {
                     isCanMove = true;
@@ -85,30 +87,27 @@ namespace BuildSystem
             if (isCanMove) {
                 if (Physics.Raycast(ray, out raycastHit, 3, mask))
                 {
-
+                    //Stop, Line ,Turn
-                    if (raycastHit.collider.tag == "TraficLight")
+                    //如果当前车子的表现形式对应了红绿灯的表现形式，那么可以通过
-                    {
+                    if (raycastHit.collider.tag == ( isTurnIng ? "Turn" : "Line"))
-                        isCanMove = false;
-                    }
-                    else
                     {
                         isCanMove = true;
                     }
-                }
                     else
                     {
-                    isCanMove = true;
+                        isCanMove = false;
+                    }
                 }
             }
 
             
 
             //停止运动销毁
-            if (stupT > 15)
+            //if (stupT > 15)
-            {
+            //{
-                CarController.Instance.number--;
+            //    CarController.Instance.number--;
-                Destroy(gameObject);
+            //    Destroy(gameObject);
-            }
+            //}
         }
 
         /// <summary>
@@ -222,7 +221,7 @@ namespace BuildSystem
         /// <returns></returns>
         IEnumerator Move(Grid nextGird) {
             Grid nextnextGrid = moveRoad.Peek();
-            List<Transform> roadPos = nextGird.placeObject.GetComponent<RoadInfo>().GetRoad(BuildSystemManager.Instance.gridMap[now.x][now.y], nextGird, nextnextGrid,ref enterRoadID,ref outRoadID);
+            List<Transform> roadPos = nextGird.placeObject.GetComponent<RoadInfo>().GetRoad(BuildSystemManager.Instance.gridMap[now.x][now.y], nextGird, nextnextGrid,ref enterRoadID,ref outRoadID,ref isTurnIng);
             isMoveEnd = false;
             for (int i = 0; i < roadPos.Count;)
             {

Assets/BuildSystem/Scripts/CarController.cs

@@ -19,13 +19,13 @@ namespace BuildSystem
         public Vector2 createTime;
         [Header("40为标准速度")]
         public Vector2 speed;
+
+        public List<Car> allCar = new List<Car>();
         void Start()
         {
             birth.Add(new Vector2Int(0 , 2));
             birth.Add(new Vector2Int(10, 0));
-            //birth.Add(new Vector2Int(3, 7));
             birth.Add(new Vector2Int(13, 5));
-            //StartCreateCar();
         }
 
         /// <summary>
@@ -33,6 +33,7 @@ namespace BuildSystem
         /// </summary>
         public void StartCreateCar() {
             StartCoroutine(CreateCar());
+            StartCoroutine(ReduceCar());
         }
         /// <summary>
         /// 创建车辆
@@ -45,7 +46,30 @@ namespace BuildSystem
                 number++;
                 GameObject car = Instantiate(carPrefabs[UnityEngine.Random.Range(0, carPrefabs.Length)].gameObject,transform);
                 car.GetComponent<Car>().OpenMove(birth[UnityEngine.Random.Range(0, birth.Count)], UnityEngine.Random.Range(speed.x,speed.y));
+                allCar.Add(car.GetComponent<Car>());
+            }
+        }
+
+        /// <summary>
+        /// 删减车辆协程
+        /// </summary>
+        /// <returns></returns>
+        IEnumerator ReduceCar()
+        {
+            while (true)
+            {
+                yield return new WaitUntil(() => { return number > carNumber; });
+                yield return new WaitForSeconds(UnityEngine.Random.Range(createTime.x, createTime.y));
+                number--;
+                int id = UnityEngine.Random.Range(0, allCar.Count - 1);
+                Car car = allCar[id];
+                allCar.RemoveAt(id);
+                Destroy(car.gameObject);
+            }
         }
+
+        public void CarNumberChange(float num) {
+            carNumber = (int)(num * 70) + 30;
         }
     }
 }

Assets/BuildSystem/Scripts/RoadInfo.cs

@@ -75,11 +75,18 @@ namespace BuildSystem
         /// <param name="nextGrid">下一个格子</param>
         /// <param name="nextnextGrid">下下个格子</param>
         /// <returns></returns>
-        public List<Transform> GetRoad(Grid nowGrid, Grid nextGrid, Grid nextnextGrid, ref int enterID, ref int outID)
+        public List<Transform> GetRoad(Grid nowGrid, Grid nextGrid, Grid nextnextGrid, ref int enterID, ref int outID,ref bool isTurn)
         {
             Dir enterDir = GetDir(new Vector2Int(nowGrid.x, nowGrid.z), new Vector2Int(nextGrid.x, nextGrid.z));
             Dir outDir = GetDir(new Vector2Int(nextGrid.x, nextGrid.z), new Vector2Int(nextnextGrid.x, nextnextGrid.z));
             int[] rayRoad = new int[2] { enterID, outID };
+            if (enterDir == outDir) {
+                isTurn = false;
+            }
+            else
+            {
+                isTurn = true;
+            }
             Transform road =  null;
             if (enterDir == Dir.up) {
                 switch (outDir) {

Assets/BuildSystem/Scripts/UI/UIManager.cs

@@ -23,6 +23,8 @@ namespace BuildSystem
         public Transform renderGrid;
         public GameObject rawImagePre;
         public GameObject carTip;
+        public GameObject carNumber;
+        public Slider carSlider;
 
         protected override void Awake()
         {
@@ -31,6 +33,8 @@ namespace BuildSystem
                 CarController.Instance.StartCreateCar();
                 carRun.gameObject.SetActive(false);
             });
+
+            carSlider.onValueChanged.AddListener(CarController.Instance.CarNumberChange);
         }
 
         /// <summary>
@@ -56,6 +60,7 @@ namespace BuildSystem
             carRun.gameObject.SetActive(true);
             render.SetActive(true);
             carTip.SetActive(true);
+            carNumber.SetActive(true);
 
             foreach (GridInfo info in BuildSystemManager.Instance.grid) {
                 GameObject obj = Instantiate(rawImagePre,renderGrid);
@@ -66,12 +71,5 @@ namespace BuildSystem
                 obj.GetComponent<RenderRawImg>().renderGrid = renderGrid;
             }
         }
-
-        private void Update()
-        {
-            if (Input.GetKeyDown(KeyCode.Space)) {
-                TwoStageEnd();
-            }
-        }
     }
 }

Assets/Resources/Prefab/TraficLightUI.prefab

@@ -89,5 +89,12 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   red: {fileID: 21300000, guid: 256cd4396474ca94ab1d67a19a865705, type: 3}
   yellow: {fileID: 21300000, guid: 4ffcc34a96712534ba1e715a213e5b4c, type: 3}
-  green: {fileID: 21300000, guid: a7042f4b99105b8499060e85631231cb, type: 3}
+  greenLine: {fileID: 21300000, guid: 9b9861c8014ea8b49a532656c59f20f7, type: 3}
-  target: {fileID: 0}
+  greenTurn: {fileID: 21300000, guid: c0b5db830cca55844b367230076c20b2, type: 3}
+  _target: {x: 0, y: 0, z: 0}
+  redTime: 0
+  yellowTime: 0
+  greenTime: 0
+  timer: 0
+  scale: 0.5
+  collider: {fileID: 0}

Assets/Resources/image/greenLightLine.png.meta

@@ -0,0 +1,116 @@
+fileFormatVersion: 2
+guid: 9b9861c8014ea8b49a532656c59f20f7
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/image/greenLightTurn.png.meta

@@ -0,0 +1,116 @@
+fileFormatVersion: 2
+guid: c0b5db830cca55844b367230076c20b2
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Pass2/Tool/TraficLightUI.cs

@@ -11,12 +11,16 @@ public enum LightDir
     left,
     right
 }
+
+
 /// <summary>
 /// 红绿灯UI
 /// </summary>
 public class TraficLightUI : MonoBehaviour
 {
-    public Sprite red, yellow, green;
+    
+
+    public Sprite red, yellow, greenLine,greenTurn;
     public Vector3 _target;
     [SerializeField]
     private float redTime, yellowTime, greenTime;
@@ -30,11 +34,13 @@ public class TraficLightUI : MonoBehaviour
     private TraficLightUI _elseDirLight;
     private TraficLightUI _paternerLight;
 
-    private float scale = 0.4f;
+    public float scale = 0.4f;
 
     public Collider collider;
 
    
+        
+
     public void Init(bool isGreen, TraficTimeSet set, Vector3 target, LightDir dir,TraficLightUI elseDirLight=null, TraficLightUI paternerLight=null)
     {
         image = GetComponent<Image>();
@@ -48,7 +54,7 @@ public class TraficLightUI : MonoBehaviour
         {
             
             _isGreen = true;
-            image.sprite = green;
+            image.sprite = greenLine;
         }
         else
         {
@@ -75,10 +81,7 @@ public class TraficLightUI : MonoBehaviour
         }
 
         if (elseDirLight!=null)
-        { 
+        { _elseDirLight = elseDirLight; }
-            _elseDirLight = elseDirLight;
-        }
-
         if (paternerLight != null)
         {
             _paternerLight = paternerLight;
@@ -92,6 +95,7 @@ public class TraficLightUI : MonoBehaviour
     {
         LightChange();
         ZoneUI();
+        transform.localScale = Vector3.one * scale;
     }
     /// <summary>
     /// 红绿灯切换
@@ -99,10 +103,26 @@ public class TraficLightUI : MonoBehaviour
     private void LightChange()
     {
 
+        if (collider.enabled == false)
+        {
+            collider.enabled = true;
+        }
+
         if (_isGreen)
         {
-            collider.enabled = false;
+            
+            //collider.enabled = false;
             timer += Time.deltaTime* TraficLightManager.Instance.traficLightTimeScale;
+            if (timer < greenTime / 2)
+            {
+                collider.gameObject.tag = "Line";
+                image.sprite = greenLine;
+            }
+            else
+            {
+                collider.gameObject.tag = "Turn";
+                image.sprite = greenTurn;
+            }
 
             if (timer >= greenTime)
             {
@@ -129,19 +149,23 @@ public class TraficLightUI : MonoBehaviour
                 {
 
                     _elseDirLight._isGreen = true;
-                    _elseDirLight.image.sprite = _elseDirLight.green;
+                    _elseDirLight.image.sprite = _elseDirLight.greenLine;
                 }
                 
             }
         }else if (_isRed)
         {
-            collider.enabled = true;
+
+            //collider.enabled = true;
+            collider.gameObject.tag = "Stop";
             if (_paternerLight != null && _elseDirLight == null)
             {
 
                 this._isGreen = _paternerLight._isGreen;
                 this.image.sprite = _paternerLight.image.sprite;
+               
             }
+
         }
     }
 

Assets/Scripts/Pass2/TraficWnd.prefab

@@ -78,6 +78,84 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u901A\u8FC7\u9F20\u6807\u62D6\u52A8\u5404\u8DEF\u6BB5\u4EA4\u901A\u706F\u7684\u7EA2\u9EC4\u7EFF\u7684\u6ED1\u52A8\u6761\uFF0C\u6765\u8BBE\u7F6E\u5176\u6BCF\u4E2A\u65B9\u5411\u7684\u7EA2\u7EFF\u706F\u65F6\u95F4"
+--- !u!1 &168003868591179158
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4788492318098709667}
+  - component: {fileID: 3022111491783568062}
+  - component: {fileID: 3483221717934219743}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4788492318098709667
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 168003868591179158}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 5122666052679474709}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 19.6}
+  m_SizeDelta: {x: 0, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3022111491783568062
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 168003868591179158}
+  m_CullTransparentMesh: 0
+--- !u!114 &3483221717934219743
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 168003868591179158}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 21
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u7EA2\u7EFF\u706F\u901F\u7387\u8C03\u6574"
 --- !u!1 &4487359192608399789
 GameObject:
   m_ObjectHideFlags: 0
@@ -487,6 +565,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4487359192800305661}
+  - {fileID: 5122666052679474709}
   - {fileID: 5533274113474029348}
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -820,7 +899,7 @@ RectTransform:
   - {fileID: 5533274113628025803}
   - {fileID: 5533274112394719251}
   m_Father: {fileID: 4487359194139227729}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
@@ -1143,6 +1222,81 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u8BBE\u7F6E\u8BF4\u660E"
+--- !u!1 &5755817961520757437
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5122666052679474709}
+  - component: {fileID: 968023496418958143}
+  - component: {fileID: 4886189102700825667}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5122666052679474709
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5755817961520757437}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 4788492318098709667}
+  m_Father: {fileID: 4487359194139227729}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 157, y: 152.3}
+  m_SizeDelta: {x: 300, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &968023496418958143
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5755817961520757437}
+  m_CullTransparentMesh: 0
+--- !u!114 &4886189102700825667
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5755817961520757437}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: fdd3632306f9ac949988a8f017be228b, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1001 &4487359192596096180
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1941,12 +2095,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 72db24831b6e14f4eae7a367cbd55507, type: 3}
---- !u!224 &3635242882310387783 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 879529369855327269, guid: 72db24831b6e14f4eae7a367cbd55507,
-    type: 3}
-  m_PrefabInstance: {fileID: 4487359193897976930}
-  m_PrefabAsset: {fileID: 0}
 --- !u!114 &3635242882310387781 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 879529369855327271, guid: 72db24831b6e14f4eae7a367cbd55507,
@@ -1959,6 +2107,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: bed5acaa06fea9d449c7cc610c49414e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!224 &3635242882310387783 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 879529369855327269, guid: 72db24831b6e14f4eae7a367cbd55507,
+    type: 3}
+  m_PrefabInstance: {fileID: 4487359193897976930}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &4708212525031206448
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -2213,12 +2367,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 72db24831b6e14f4eae7a367cbd55507, type: 3}
---- !u!224 &5576117239162622485 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 879529369855327269, guid: 72db24831b6e14f4eae7a367cbd55507,
-    type: 3}
-  m_PrefabInstance: {fileID: 4708212525031206448}
-  m_PrefabAsset: {fileID: 0}
 --- !u!114 &5576117239162622487 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 879529369855327271, guid: 72db24831b6e14f4eae7a367cbd55507,
@@ -2231,3 +2379,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: bed5acaa06fea9d449c7cc610c49414e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!224 &5576117239162622485 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 879529369855327269, guid: 72db24831b6e14f4eae7a367cbd55507,
+    type: 3}
+  m_PrefabInstance: {fileID: 4708212525031206448}
+  m_PrefabAsset: {fileID: 0}

ProjectSettings/TagManager.asset

@@ -11,6 +11,9 @@ TagManager:
   - CarFw
   - CarFr
   - TraficLight
+  - Stop
+  - Line
+  - Turn
   layers:
   - Default
   - TransparentFX

Unity.CollabProxy.Editor.csproj

@@ -652,12 +652,12 @@
     <Reference Include="Boo.Lang">
       <HintPath>D:/UnityHub/2019.4.17f1c1/Editor/Data/MonoBleedingEdge/lib/mono/unityscript/Boo.Lang.dll</HintPath>
     </Reference>
-    <Reference Include="UnityEngine.UI">
-      <HintPath>D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
-    </Reference>
     <Reference Include="UnityEditor.UI">
       <HintPath>D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
     </Reference>
+    <Reference Include="UnityEngine.UI">
+      <HintPath>D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="UnityEditor.TestRunner.csproj">

Unity.Rider.Editor.csproj

@@ -653,12 +653,12 @@
     <Reference Include="Boo.Lang">
       <HintPath>D:/UnityHub/2019.4.17f1c1/Editor/Data/MonoBleedingEdge/lib/mono/unityscript/Boo.Lang.dll</HintPath>
     </Reference>
-    <Reference Include="UnityEngine.UI">
-      <HintPath>D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
-    </Reference>
     <Reference Include="UnityEditor.UI">
       <HintPath>D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
     </Reference>
+    <Reference Include="UnityEngine.UI">
+      <HintPath>D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="UnityEditor.TestRunner.csproj">

Unity.TextMeshPro.Editor.csproj

@@ -679,12 +679,12 @@
     <Reference Include="Boo.Lang">
       <HintPath>D:/UnityHub/2019.4.17f1c1/Editor/Data/MonoBleedingEdge/lib/mono/unityscript/Boo.Lang.dll</HintPath>
     </Reference>
-    <Reference Include="UnityEngine.UI">
-      <HintPath>D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
-    </Reference>
     <Reference Include="UnityEditor.UI">
       <HintPath>D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
     </Reference>
+    <Reference Include="UnityEngine.UI">
+      <HintPath>D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="Unity.TextMeshPro.csproj">

Unity.TextMeshPro.csproj

@@ -673,12 +673,12 @@
     <Reference Include="System.Xml.Serialization">
       <HintPath>D:/UnityHub/2019.4.17f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Xml.Serialization.dll</HintPath>
     </Reference>
-    <Reference Include="UnityEngine.UI">
-      <HintPath>D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
-    </Reference>
     <Reference Include="UnityEditor.UI">
       <HintPath>D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
     </Reference>
+    <Reference Include="UnityEngine.UI">
+      <HintPath>D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup></ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

Unity.Timeline.Editor.csproj

@@ -868,12 +868,12 @@
     <Reference Include="Boo.Lang">
       <HintPath>D:/UnityHub/2019.4.17f1c1/Editor/Data/MonoBleedingEdge/lib/mono/unityscript/Boo.Lang.dll</HintPath>
     </Reference>
-    <Reference Include="UnityEngine.UI">
-      <HintPath>D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
-    </Reference>
     <Reference Include="UnityEditor.UI">
       <HintPath>D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
     </Reference>
+    <Reference Include="UnityEngine.UI">
+      <HintPath>D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="Unity.Timeline.csproj">

Unity.Timeline.csproj

@@ -684,12 +684,12 @@
     <Reference Include="System.Xml.Serialization">
       <HintPath>D:/UnityHub/2019.4.17f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Xml.Serialization.dll</HintPath>
     </Reference>
-    <Reference Include="UnityEngine.UI">
-      <HintPath>D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
-    </Reference>
     <Reference Include="UnityEditor.UI">
       <HintPath>D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
     </Reference>
+    <Reference Include="UnityEngine.UI">
+      <HintPath>D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup></ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

Unity.VSCode.Editor.csproj

@@ -639,12 +639,12 @@
     <Reference Include="Boo.Lang">
       <HintPath>D:/UnityHub/2019.4.17f1c1/Editor/Data/MonoBleedingEdge/lib/mono/unityscript/Boo.Lang.dll</HintPath>
     </Reference>
-    <Reference Include="UnityEngine.UI">
-      <HintPath>D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
-    </Reference>
     <Reference Include="UnityEditor.UI">
       <HintPath>D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
     </Reference>
+    <Reference Include="UnityEngine.UI">
+      <HintPath>D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="UnityEditor.TestRunner.csproj">