From 2d6bb93cd28461cb02851bcb41fdea870f3dea97 Mon Sep 17 00:00:00 2001
From: YangHua <1475658476@qq.com>
Date: Sun, 19 Nov 2023 18:38:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=A0=E8=BD=BD=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Resources/DeviceBtn/HuoPao.prefab | 2 +-
 Assets/Resources/DeviceBtn/LeiDa.prefab  | 2 +-
 Assets/Resources/DeviceBtn/WRJ.prefab    | 2 +-
 Assets/Zion/Scripts/Adam/GameManager.cs  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Assets/Resources/DeviceBtn/HuoPao.prefab b/Assets/Resources/DeviceBtn/HuoPao.prefab
index d8f722ea..f634036e 100644
--- a/Assets/Resources/DeviceBtn/HuoPao.prefab
+++ b/Assets/Resources/DeviceBtn/HuoPao.prefab
@@ -251,5 +251,5 @@ MonoBehaviour:
   - {fileID: 0}
   - {fileID: 0}
   - {fileID: 0}
-  modelname_text: {fileID: 0}
+  modelname_text: {fileID: 3438159621284867111}
   isDragWRJ: 0
diff --git a/Assets/Resources/DeviceBtn/LeiDa.prefab b/Assets/Resources/DeviceBtn/LeiDa.prefab
index ba1550e2..524fc088 100644
--- a/Assets/Resources/DeviceBtn/LeiDa.prefab
+++ b/Assets/Resources/DeviceBtn/LeiDa.prefab
@@ -173,7 +173,7 @@ MonoBehaviour:
   - {fileID: 0}
   - {fileID: 0}
   - {fileID: 0}
-  modelname_text: {fileID: 0}
+  modelname_text: {fileID: 5970882835879795696}
   isDragWRJ: 0
 --- !u!1 &5970882835879795698
 GameObject:
diff --git a/Assets/Resources/DeviceBtn/WRJ.prefab b/Assets/Resources/DeviceBtn/WRJ.prefab
index 1b387c95..1a68e9f6 100644
--- a/Assets/Resources/DeviceBtn/WRJ.prefab
+++ b/Assets/Resources/DeviceBtn/WRJ.prefab
@@ -177,7 +177,7 @@ MonoBehaviour:
   - {fileID: 0}
   - {fileID: 0}
   - {fileID: 0}
-  modelname_text: {fileID: 0}
+  modelname_text: {fileID: 3625114602127132433}
   isDragWRJ: 1
 --- !u!1 &3625114603613546360
 GameObject:
diff --git a/Assets/Zion/Scripts/Adam/GameManager.cs b/Assets/Zion/Scripts/Adam/GameManager.cs
index d8119a24..54eacb57 100644
--- a/Assets/Zion/Scripts/Adam/GameManager.cs
+++ b/Assets/Zion/Scripts/Adam/GameManager.cs
@@ -129,7 +129,7 @@ public class GameManager : MonoBehaviour
     {
         string info = UIBootstrap.Instance.currentSceneInfo.data.DeviceContent;
         Debug.Log(info);
-        if (info.Length > 0 &&string .IsNullOrWhiteSpace(info))
+        if (info.Length > 0 &&!string .IsNullOrWhiteSpace(info))
         {
             modelsInfo = Jsonanalyze.FromJson<List<ModelInfo>>(info);
             for (int i = 0; i < modelsInfo.Count; i++)