Merge branch 'main' of http://www.chatgpt918.top:3000/wartheking/WaterFlush

Assets/Prefabs/UI/XHYZT/RKZY.prefab

@@ -6921,8 +6921,8 @@ RectTransform:
   - {fileID: 9093061654171932179}
   - {fileID: 9093061653790504663}
   - {fileID: 9093061654966100337}
-  - {fileID: 9093061653291335120}
   - {fileID: 9093061653547392614}
+  - {fileID: 9093061653291335120}
   m_Father: {fileID: 9093061653547399692}
   m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -8498,7 +8498,7 @@ RectTransform:
   - {fileID: 9093061654250234089}
   - {fileID: 9093061654520656945}
   m_Father: {fileID: 9093061653288701945}
-  m_RootOrder: 19
+  m_RootOrder: 20
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -11175,8 +11175,8 @@ RectTransform:
   - {fileID: 9093061654473964874}
   - {fileID: 9093061654439686107}
   - {fileID: 9093061654508591210}
-  - {fileID: 9093061654094578440}
   - {fileID: 9093061655173667199}
+  - {fileID: 9093061654094578440}
   m_Father: {fileID: 9093061653547399692}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -15404,7 +15404,7 @@ RectTransform:
   m_Children:
   - {fileID: 9093061654502916386}
   m_Father: {fileID: 9093061653288701945}
-  m_RootOrder: 20
+  m_RootOrder: 19
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -17173,8 +17173,8 @@ RectTransform:
   - {fileID: 9093061653470972603}
   - {fileID: 9093061654687722099}
   - {fileID: 9093061653243042817}
-  - {fileID: 9093061653995338931}
   - {fileID: 9093061654484229631}
+  - {fileID: 9093061653995338931}
   m_Father: {fileID: 9093061654363556753}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -22674,8 +22674,8 @@ RectTransform:
   - {fileID: 9093061654072247880}
   - {fileID: 9093061654206497080}
   - {fileID: 9093061653641891623}
-  - {fileID: 9093061654922658960}
   - {fileID: 9093061654333608751}
+  - {fileID: 9093061654922658960}
   m_Father: {fileID: 9093061654363556753}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -25418,7 +25418,7 @@ RectTransform:
   - {fileID: 9093061654420124646}
   - {fileID: 9093061654101750909}
   m_Father: {fileID: 9093061653632941889}
-  m_RootOrder: 26
+  m_RootOrder: 27
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -27072,7 +27072,7 @@ RectTransform:
   - {fileID: 9093061654638090311}
   - {fileID: 9093061653249892629}
   m_Father: {fileID: 9093061653428426712}
-  m_RootOrder: 18
+  m_RootOrder: 19
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -27765,7 +27765,7 @@ RectTransform:
   - {fileID: 9093061654616157509}
   - {fileID: 9093061654729128352}
   m_Father: {fileID: 9093061655308519380}
-  m_RootOrder: 26
+  m_RootOrder: 27
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -31611,7 +31611,7 @@ RectTransform:
   m_Children:
   - {fileID: 9093061653234529556}
   m_Father: {fileID: 9093061653915434462}
-  m_RootOrder: 27
+  m_RootOrder: 26
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -32646,7 +32646,7 @@ RectTransform:
   - {fileID: 9093061653434614468}
   - {fileID: 9093061654382310616}
   m_Father: {fileID: 9093061654506419288}
-  m_RootOrder: 26
+  m_RootOrder: 27
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -34366,7 +34366,7 @@ RectTransform:
   m_Children:
   - {fileID: 9093061653476887218}
   m_Father: {fileID: 9093061653632941889}
-  m_RootOrder: 27
+  m_RootOrder: 26
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -35099,8 +35099,8 @@ RectTransform:
   - {fileID: 9093061654547690391}
   - {fileID: 9093061654503076447}
   - {fileID: 9093061654759647064}
-  - {fileID: 9093061654399081119}
   - {fileID: 9093061655340129781}
+  - {fileID: 9093061654399081119}
   m_Father: {fileID: 9093061654363556753}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -36370,7 +36370,7 @@ RectTransform:
   m_Children:
   - {fileID: 9093061653333981062}
   m_Father: {fileID: 9093061655308519380}
-  m_RootOrder: 27
+  m_RootOrder: 26
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -43676,7 +43676,7 @@ RectTransform:
   - {fileID: 9093061654642475065}
   - {fileID: 9093061655299507566}
   m_Father: {fileID: 9093061653915434462}
-  m_RootOrder: 26
+  m_RootOrder: 27
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -50136,7 +50136,7 @@ RectTransform:
   m_Children:
   - {fileID: 9093061655282686621}
   m_Father: {fileID: 9093061653428426712}
-  m_RootOrder: 19
+  m_RootOrder: 18
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -53370,8 +53370,8 @@ RectTransform:
   - {fileID: 9093061654029534039}
   - {fileID: 9093061654993506973}
   - {fileID: 9093061655336903256}
-  - {fileID: 9093061654135754304}
   - {fileID: 9093061654518704622}
+  - {fileID: 9093061654135754304}
   m_Father: {fileID: 9093061654363556753}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -54547,7 +54547,7 @@ RectTransform:
   m_Children:
   - {fileID: 9093061654544985612}
   m_Father: {fileID: 9093061654506419288}
-  m_RootOrder: 27
+  m_RootOrder: 26
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}

Assets/StreamingAssets/moveplan.json

@@ -341,32 +341,92 @@
         "carNum": 201,
         "paths": [
             {
-                "longitude": 113.27521748871973,
-                "latitude": 29.98282759387136
+                "longitude": 113.769409,
+                "latitude": 29.942348
             },
             {
-                "longitude": 113.2755083239585,
-                "latitude": 29.9929537422292
+                "longitude": 113.800872,
+                "latitude": 29.940392
             },
             {
-                "longitude": 113.27375004918832,
-                "latitude": 30.001966132515054
+                "longitude": 113.831997,
+                "latitude": 29.959830
             },
             {
-                "longitude": 113.27044500701598,
-                "latitude": 30.009557906821822
+                "longitude": 113.825771,
+                "latitude": 29.973529
             },
             {
-                "longitude": 113.27496629220087,
-                "latitude": 30.020161380067655
+                "longitude": 113.841363,
+                "latitude": 29.983892
             },
             {
-                "longitude": 113.26727214434092,
-                "latitude": 30.01918399666423
+                "longitude": 113.848036,
+                "latitude": 29.998774
             },
             {
-                "longitude": 113.25115678573958,
-                "latitude": 30.02397999542926
+                "longitude": 113.845097,
+                "latitude": 30.007006
+            },
+            {
+                "longitude": 113.860124,
+                "latitude": 30.011570
+            },
+            {
+                "longitude": 113.875909,
+                "latitude": 30.027715
+            },
+            {
+                "longitude": 113.926611,
+                "latitude": 30.053076
+            },
+            {
+                "longitude": 113.934489,
+                "latitude": 30.048666
+            },
+            {
+                "longitude": 113.961316,
+                "latitude": 30.064075
+            },
+            {
+                "longitude": 113.986407,
+                "latitude": 30.022952
+            },
+            {
+                "longitude": 114.019463,
+                "latitude": 30.006126
+            },
+            {
+                "longitude": 114.066084,
+                "latitude": 30.037618
+            },
+            {
+                "longitude": 114.130701,
+                "latitude": 30.130374
+            },
+            {
+                "longitude": 114.154725,
+                "latitude": 30.231720
+            },
+            {
+                "longitude": 114.201074,
+                "latitude": 30.375086
+            },
+            {
+                "longitude": 114.247161,
+                "latitude": 30.412165
+            },
+            {
+                "longitude": 114.264803,
+                "latitude": 30.471926
+            },
+            {
+                "longitude": 114.319659,
+                "latitude": 30.460144
+            },
+            {
+                "longitude": 114.337607,
+                "latitude": 30.500558
             }
         ]
     },
@@ -388,40 +448,44 @@
         "carNum": 143,
         "paths": [
             {
-                "longitude": 113.18066683660523,
-                "latitude": 29.96571201749763
+                "longitude": 113.553791,
+                "latitude": 30.065576
             },
             {
-                "longitude": 113.18846673814917,
-                "latitude": 29.96384816352366
+                "longitude": 113.538792,
+                "latitude": 30.064210
             },
             {
-                "longitude": 113.19428359421735,
-                "latitude": 29.961654734272805
+                "longitude": 113.468948,
+                "latitude": 30.004251
             },
             {
-                "longitude": 113.19998148369488,
-                "latitude": 29.963245828071223
+                "longitude": 113.428251,
+                "latitude": 30.017582
             },
             {
-                "longitude": 113.2011845138008,
-                "latitude": 29.970837591539553
+                "longitude": 113.411665,
+                "latitude": 30.026795
             },
             {
-                "longitude": 113.19955846895884,
-                "latitude": 29.987930450543498
+                "longitude": 113.403871,
+                "latitude": 30.032577
             },
             {
-                "longitude": 113.199624533492,
-                "latitude": 30.005159678796783
+                "longitude": 113.374708,
+                "latitude": 30.061477
             },
             {
-                "longitude": 113.19721847328017,
-                "latitude": 30.01741107178081
+                "longitude": 113.368654,
+                "latitude": 30.055098
             },
             {
-                "longitude": 113.22336797542012,
-                "latitude": 30.021763837970184
+                "longitude": 113.370664,
+                "latitude": 30.043735
+            },
+            {
+                "longitude": 113.353464,
+                "latitude": 30.031465
             }
         ]
     },
@@ -443,8 +507,44 @@
         "carNum": 60,
         "paths": [
             {
-                "longitude": 113.37299382992038,
-                "latitude": 30.028821456029963
+                "longitude": 113.669311,
+                "latitude": 29.971938
+            },
+            {
+                "longitude": 113.663254,
+                "latitude": 29.970862
+            },
+            {
+                "longitude": 113.639675,
+                "latitude": 29.947033
+            },
+            {
+                "longitude": 113.635682,
+                "latitude": 29.946151
+            },
+            {
+                "longitude": 113.610954,
+                "latitude": 29.916040
+            },
+            {
+                "longitude": 113.589607,
+                "latitude": 29.900140
+            },
+            {
+                "longitude": 113.558098,
+                "latitude": 29.901034
+            },
+            {
+                "longitude": 113.506702,
+                "latitude": 29.851680
+            },
+            {
+                "longitude": 113.468842,
+                "latitude": 29.837707
+            },
+            {
+                "longitude": 113.472642,
+                "latitude": 29.828662
             }
         ]
     },
@@ -466,32 +566,88 @@
         "carNum": 25,
         "paths": [
             {
-                "longitude": 113.45768223235987,
-                "latitude": 30.000079555752084
+                "longitude": 113.595595, 
+                "latitude": 29.916818
+            },
+            {
+                "longitude": 113.601877, 
+                "latitude": 29.908872
+            },
+            {
+                "longitude": 113.635385, 
+                "latitude": 29.945433
+            },
+            {
+                "longitude": 113.639282, 
+                "latitude": 29.946504
+            },
+            {
+                "longitude": 113.662908, 
+                "latitude": 29.969957
+            },
+            {
+                "longitude": 113.705793, 
+                "latitude": 29.983897
             },
             {
-                "longitude": 113.4633272449954,
-                "latitude": 30.003182178362483
+                "longitude": 113.716958, 
+                "latitude": 29.995167
             },
             {
-                "longitude": 113.4553951387387,
-                "latitude": 30.006864419055532
+                "longitude": 113.714155, 
+                "latitude": 30.021336
             },
             {
-                "longitude": 113.44656407573694,
-                "latitude": 30.009614727342377
+                "longitude": 113.733922, 
+                "latitude": 30.045699
             },
             {
-                "longitude": 113.42800296777294,
-                "latitude": 30.014944882354403
+                "longitude": 113.763037, 
+                "latitude": 30.065431
             },
             {
-                "longitude": 113.40377039614468,
-                "latitude": 30.029014662057513
+                "longitude": 113.826811, 
+                "latitude": 30.136093
             },
             {
-                "longitude": 113.39229528931887,
-                "latitude": 30.03847027949981
+                "longitude": 113.845638, 
+                "latitude": 30.157031
+            },
+            {
+                "longitude": 113.847809, 
+                "latitude": 30.176525
+            },
+            {
+                "longitude": 113.837811, 
+                "latitude": 30.223525
+            },
+            {
+                "longitude": 113.893679, 
+                "latitude": 30.297595
+            },
+            {
+                "longitude": 113.962140, 
+                "latitude": 30.317401
+            },
+            {
+                "longitude": 113.998116, 
+                "latitude": 30.332233
+            },
+            {
+                "longitude": 114.031708, 
+                "latitude": 30.335106
+            },
+            {
+                "longitude": 114.055085, 
+                "latitude": 30.345987
+            },
+            {
+                "longitude": 114.082811, 
+                "latitude": 30.335171
+            },
+            {
+                "longitude": 114.079464, 
+                "latitude": 30.314473
             }
         ]
     },
@@ -513,32 +669,36 @@
         "carNum": 74,
         "paths": [
             {
-                "longitude": 113.45768223235987,
-                "latitude": 30.000079555752084
+                "longitude": 113.464458, 
+                "latitude": 29.999861
+            },
+            {
+                "longitude": 113.469295, 
+                "latitude": 30.004145
             },
             {
-                "longitude": 113.4633272449954,
-                "latitude": 30.003182178362483
+                "longitude": 113.465685, 
+                "latitude": 30.006129
             },
             {
-                "longitude": 113.4553951387387,
-                "latitude": 30.006864419055532
+                "longitude": 113.434991, 
+                "latitude": 30.01399
             },
             {
-                "longitude": 113.44656407573694,
-                "latitude": 30.009614727342377
+                "longitude": 113.410514, 
+                "latitude": 30.027662
             },
             {
-                "longitude": 113.42800296777294,
-                "latitude": 30.014944882354403
+                "longitude": 113.406776, 
+                "latitude": 30.029342
             },
             {
-                "longitude": 113.40377039614468,
-                "latitude": 30.029014662057513
+                "longitude": 113.393789, 
+                "latitude": 30.041043
             },
             {
-                "longitude": 113.39229528931887,
-                "latitude": 30.03847027949981
+                "longitude": 113.382490, 
+                "latitude": 30.036270
             }
         ]
     }