新增比亚迪E6车型

Assets/3rdParty/Demigiant/DemiLib/Core/Editor/Imgs/whiteSquare.png.meta

@@ -89,6 +89,54 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 100
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 100
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 100
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 100
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/Scripts/CarControl.cs

@@ -1,3 +1,4 @@
+using System.Linq;
 using System.Threading.Tasks;
 using UnityEngine;
 
@@ -14,6 +15,8 @@ public class CarControl : MonoBehaviour
             Bootstrap.Instance.eventCenter.AddEventListener(Enum_EventType.ChangeCarSwitch, ChangeCarSwitch);
             Bootstrap.Instance.eventCenter.AddEventListener(Enum_EventType.CanRotate, CanRotate);
         }
+
+        ResetCar();
     }
 
     // Update is called once per frame
@@ -24,10 +27,30 @@ public class CarControl : MonoBehaviour
             transform.Rotate(transform.forward, speed * Time.deltaTime, Space.World);
         }
     }
+    public GameObject[] allCars;
     public GameObject testcar;
     public async void ChangeCarSwitch()
     {
-        if (testcar == null) return;
+        ResetCar();
+
+        switch (GetawayMqttClient.licensePlateData.VehicleBrand)
+        {
+            case "BYDE6":
+            case "±ÈÑǵÏE6":
+                testcar = allCars[1];
+                break;
+            case "BYDËÎ":
+            case "±ÈÑǵÏ":
+                testcar = allCars[0];
+                break;
+        }
+        testcar.SetActive(true);
+
+        if (testcar == null)
+        {
+            Debug.Log($"testcar is null, return");
+            return;
+        }
         await Task.Delay(2000);
         float a = 4f;
         while (a <= 9)
@@ -56,6 +79,14 @@ public class CarControl : MonoBehaviour
         await Task.Delay(50);
     }
 
+    void ResetCar()
+    {
+        if (allCars.Count() <= 0) return;
+        for (int i = 0; i < allCars.Length; i++)
+        {
+            allCars[i].SetActive(false);
+        }
+    }
 
     private void OnDisable()
     {
@@ -64,5 +95,6 @@ public class CarControl : MonoBehaviour
             Bootstrap.Instance.eventCenter.RemoveEventListener(Enum_EventType.ChangeCarSwitch, ChangeCarSwitch);
             Bootstrap.Instance.eventCenter.RemoveEventListener(Enum_EventType.CanRotate, CanRotate);
         }
+        ResetCar();
     }
 }

Assets/Scripts/ChangeObjMat.cs

@@ -173,7 +173,20 @@ public class ChangeObjMat : MonoBehaviour
         #endregion
         #region ²åǹ²Ù×÷
         m_Highlight.SetHighlighted(true);
-        transform.parent.DOLocalRotate(new Vector3(-90, 0, -320), 5);
+
+        switch (GetawayMqttClient.licensePlateData.VehicleBrand)
+        {
+            case "BYDE6":
+            case "±ÈÑǵÏE6":
+                transform.parent.DOLocalRotate(new Vector3(-90, 0, -400), 5);
+                break;
+            case "BYDËÎ":
+            case "±ÈÑǵÏ":
+                transform.parent.DOLocalRotate(new Vector3(-90, 0, -320), 5);
+                break;
+        }
+       // transform.parent.DOLocalRotate(new Vector3(-90, 0, -320), 5);
+        
         yield return new WaitForSeconds(5);
 
         if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel<UI_MiddleTipPanel>(this, E_UI_Layer.Top, (p) =>

Assets/Scripts/GetawayMqttClient.cs

@@ -101,6 +101,11 @@ public class GetawayMqttClient : MonoBehaviour
                     case "BYDËÎ":
                         Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.ChangeCarSwitch);
                         break;
+                    case "BYDE6":
+                    case "比亚迪E6":
+                        //Debug.Log("切换到BYDE6 切换到BYDE6");
+                        Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.ChangeCarSwitch);
+                        break;
                     default:
                         break;
                 }

Assets/StreamingAssets/StateTrendConfig/WebUrl.json

@@ -1,5 +1,5 @@
 {
-  "weburl": "http://172.16.1.177:8080/#/integratedData",
+  "weburl": "http://172.16.1.177:8099/#/integratedData",
   "h5url1": "http://172.16.1.177:8081/#/",
   "h5url2": "http://172.16.1.177:8081/#/pages/balanced/index"
 }

Assets/StreamingAssets/StateTrendConfig/mqttConfig.json

@@ -1,5 +1,5 @@
 {
-  "ip": "172.16.1.146",
+  "ip": "172.16.1.253",
   "port": 1883,
   "userName": "dev",
   "passwd": "!11@22#33",

ProjectSettings/ProjectSettings.asset

@@ -277,7 +277,196 @@ PlayerSettings:
   AndroidValidateAppBundleSize: 1
   AndroidAppBundleSizeToValidate: 150
   m_BuildTargetIcons: []
-  m_BuildTargetPlatformIcons: []
+  m_BuildTargetPlatformIcons:
+  - m_BuildTarget: iPhone
+    m_Icons:
+    - m_Textures: []
+      m_Width: 180
+      m_Height: 180
+      m_Kind: 0
+      m_SubKind: iPhone
+    - m_Textures: []
+      m_Width: 120
+      m_Height: 120
+      m_Kind: 0
+      m_SubKind: iPhone
+    - m_Textures: []
+      m_Width: 167
+      m_Height: 167
+      m_Kind: 0
+      m_SubKind: iPad
+    - m_Textures: []
+      m_Width: 152
+      m_Height: 152
+      m_Kind: 0
+      m_SubKind: iPad
+    - m_Textures: []
+      m_Width: 76
+      m_Height: 76
+      m_Kind: 0
+      m_SubKind: iPad
+    - m_Textures: []
+      m_Width: 120
+      m_Height: 120
+      m_Kind: 3
+      m_SubKind: iPhone
+    - m_Textures: []
+      m_Width: 80
+      m_Height: 80
+      m_Kind: 3
+      m_SubKind: iPhone
+    - m_Textures: []
+      m_Width: 80
+      m_Height: 80
+      m_Kind: 3
+      m_SubKind: iPad
+    - m_Textures: []
+      m_Width: 40
+      m_Height: 40
+      m_Kind: 3
+      m_SubKind: iPad
+    - m_Textures: []
+      m_Width: 87
+      m_Height: 87
+      m_Kind: 1
+      m_SubKind: iPhone
+    - m_Textures: []
+      m_Width: 58
+      m_Height: 58
+      m_Kind: 1
+      m_SubKind: iPhone
+    - m_Textures: []
+      m_Width: 29
+      m_Height: 29
+      m_Kind: 1
+      m_SubKind: iPhone
+    - m_Textures: []
+      m_Width: 58
+      m_Height: 58
+      m_Kind: 1
+      m_SubKind: iPad
+    - m_Textures: []
+      m_Width: 29
+      m_Height: 29
+      m_Kind: 1
+      m_SubKind: iPad
+    - m_Textures: []
+      m_Width: 60
+      m_Height: 60
+      m_Kind: 2
+      m_SubKind: iPhone
+    - m_Textures: []
+      m_Width: 40
+      m_Height: 40
+      m_Kind: 2
+      m_SubKind: iPhone
+    - m_Textures: []
+      m_Width: 40
+      m_Height: 40
+      m_Kind: 2
+      m_SubKind: iPad
+    - m_Textures: []
+      m_Width: 20
+      m_Height: 20
+      m_Kind: 2
+      m_SubKind: iPad
+    - m_Textures: []
+      m_Width: 1024
+      m_Height: 1024
+      m_Kind: 4
+      m_SubKind: App Store
+  - m_BuildTarget: Android
+    m_Icons:
+    - m_Textures: []
+      m_Width: 432
+      m_Height: 432
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 324
+      m_Height: 324
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 216
+      m_Height: 216
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 162
+      m_Height: 162
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 108
+      m_Height: 108
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 81
+      m_Height: 81
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 192
+      m_Height: 192
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 144
+      m_Height: 144
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 96
+      m_Height: 96
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 72
+      m_Height: 72
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 48
+      m_Height: 48
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 36
+      m_Height: 36
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 192
+      m_Height: 192
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 144
+      m_Height: 144
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 96
+      m_Height: 96
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 72
+      m_Height: 72
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 48
+      m_Height: 48
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 36
+      m_Height: 36
+      m_Kind: 0
+      m_SubKind: 
   m_BuildTargetBatching:
   - m_BuildTarget: Standalone
     m_StaticBatching: 1

ProjectSettings/UnityConnectSettings.asset

@@ -4,7 +4,7 @@
 UnityConnectSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 1
-  m_Enabled: 0
+  m_Enabled: 1
   m_TestMode: 0
   m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events
   m_EventUrl: https://cdp.cloud.unity3d.com/v1/events

UserSettings/EditorUserSettings.asset

@@ -12,10 +12,10 @@ EditorUserSettings:
       value: 53500c5501005c0b5b5a087b11205a444e4e4c787b7b7e662c701b61b0e26469
       flags: 0
     RecentlyUsedSceneGuid-2:
-      value: 5408510557000d5f0e5a582145755b4412154c2e292d77362b7b4432b0b76268
+      value: 0657005552570c0f0e5e5d7215215e444f4f1a7b7a2c7f6474794562b1b3656b
       flags: 0
     RecentlyUsedSceneGuid-3:
-      value: 0657005552570c0f0e5e5d7215215e444f4f1a7b7a2c7f6474794562b1b3656b
+      value: 5408510557000d5f0e5a582145755b4412154c2e292d77362b7b4432b0b76268
       flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650